From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Thu, 30 Jan 2020 14:30:55 +0000 (-0300)
Subject: screenShield: Rename _liftShield to _activateDialog
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~777^2^2~125
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=cd0914406931646400b2cdf2b2496d6cdd8b7696;p=gnome-shell.git

screenShield: Rename _liftShield to _activateDialog

Lifting the shield is now what happens *after* successfully logging
in, not before. Now, what we do is activate the dialog before logging
in.

Rename the method to reflect that.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872
---

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index b2b7c8a95..faa1b666e 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -86,14 +86,14 @@ var ScreenShield = class {
         this._smartcardManager.connect('smartcard-inserted',
                                        (manager, token) => {
                                            if (this._isLocked && token.UsedToLogin)
-                                               this._liftShield();
+                                               this._activateDialog();
                                        });
 
         this._oVirtCredentialsManager = OVirt.getOVirtCredentialsManager();
         this._oVirtCredentialsManager.connect('user-authenticated',
                                               () => {
                                                   if (this._isLocked)
-                                                      this._liftShield();
+                                                      this._activateDialog();
                                               });
 
         this._loginManager = LoginManager.getLoginManager();
@@ -157,7 +157,7 @@ var ScreenShield = class {
         this._syncInhibitor();
     }
 
-    _liftShield() {
+    _activateDialog() {
         if (this._isLocked) {
             this._ensureUnlockDialog(true /* allowCancel */);
             this._dialog.activate();
@@ -220,7 +220,7 @@ var ScreenShield = class {
             GLib.unichar_isgraph(unichar))
             this._dialog.addCharacter(unichar);
 
-        this._liftShield();
+        this._activateDialog();
         return Clutter.EVENT_STOP;
     }